feat: add mouse support #49

pablospe · 2026-01-06T14:35:41Z

Summary

Click on files in the tree to select them
Scroll wheel works in both file tree and diff viewer panes
Drag the border between panes to resize sidebar
Click on the filter box to enter search mode
Click on search results to select a file

dlvhdr · 2026-01-06T19:41:30Z

My god, this is great!
Do you think the code would be simpler if we use something like https://github.com/lrstanley/bubblezone? I've used it in my other projects and it's been great

pablospe · 2026-01-06T21:51:23Z

Please take another look! The bubblezone dependency requires Go 1.23.0. When I ran go get github.com/lrstanley/bubblezone, it automatically upgraded.

dlvhdr

looks good! I left some suggestions for you to think about. Let me know what you think and how we should proceed.

pkg/ui/panes/filetree/filetree.go

pkg/ui/mainModel.go

pablospe · 2026-01-07T22:49:13Z

I fixed the conflicts with a rebase and then git push --force. I think github is showing duplicates? (hmm... I am not sure).

I would recommend to set merge squash as the only option for merging against main in the github settings, so one PR is one commit in main, and it is easier to revert and follow the changes.

Create a rule for the main branch:

then:

- Click on files in the tree to select them - Scroll wheel works in both file tree and diff viewer panes - Drag the border between panes to resize sidebar

- Add bubblezone dependency for zone-based click detection - Mark UI zones (searchbox, filetree, searchresults, diffviewer) - Replace coordinate-based checks with zone.InBounds() - Use zone.Pos() for relative coordinates in click handlers - Keep hybrid approach for sidebar resize (coordinate-based) - Update FileNode to implement new tree.Node interface

Add SetCursorNoScroll method to filetree that updates selection without scrolling the viewport. Use it in handleFileTreeClick so the view stays in place when clicking a visible file.

Consolidate duplicate root-hidden checks into a single reusable method. Also fixes inconsistency where one check used '.' and another used dirIcon+'.' - now all use the correct dirIcon+'.' check.

When user drags sidebar width below 10px, automatically hide it. Pressing 'e' to show the tree again resets to default width (26).

Allow dragging the sidebar back open by clicking and dragging the thin vertical line that remains when sidebar is hidden.

Add constants for sidebar constraints and scroll speed: - sidebarMinWidth (20) - sidebarHideWidth (10) - scrollLines (3) Also add comment explaining Width(0) for grab line.

pablospe · 2026-01-08T14:17:02Z

I resolved the conflicts, please take another look.

dlvhdr · 2026-01-09T16:42:51Z

I fixed the conflicts with a rebase and then git push --force. I think github is showing duplicates? (hmm... I am not sure).

that's my bad. I haven't set the repo properly (it's new compared to my others).
Will fix now

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [dlvhdr/diffnav](https://github.com/dlvhdr/diffnav) | minor | `v0.3.1` → `v0.4.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>dlvhdr/diffnav (dlvhdr/diffnav)</summary> ### [`v0.4.0`](https://github.com/dlvhdr/diffnav/releases/tag/v0.4.0) [Compare Source](dlvhdr/diffnav@v0.3.1...v0.4.0) ### Switch focus between panes, config file, mouse support and more! This release is brought to you by [@pablospe](https://github.com/pablospe) who made some serious improvements across the board! Thank you [@pablospe](https://github.com/pablospe), your work is really appreciated! <3 #### Focus Switching You can now switch focus between the file tree and the diff by hitting <kbd>tab</kbd>. This lets you use a wider set of movement keybinds like actually navigating one line at a time with <kbd>j/k</kbd>. #### Config File `diffnav` now has a config file (check the readme on how to set it up). It lets you hide the footer/header, hide the file tree by default or set its width. #### Mouse Support You can now click the files in the tree or scroll the diff with your mouse! Again, this was all done by [@pablospe](https://github.com/pablospe) so give him some love! #### Changelog - [`ccb29e8`](dlvhdr/diffnav@ccb29e8) Revert "fix: prevent j/k from scrolling inactive panel" - [`3a431de`](dlvhdr/diffnav@3a431de) chore: add funding configuration for GitHub - [`37a52c1`](dlvhdr/diffnav@37a52c1) feat: add config option to hide header - [`e5efc99`](dlvhdr/diffnav@e5efc99) feat: add more config options - [`8d516cd`](dlvhdr/diffnav@8d516cd) feat: add mouse support ([#49](dlvhdr/diffnav#49)) - [`60f5aa3`](dlvhdr/diffnav@60f5aa3) feat: add panel switching with h/l and arrow keys - [`bfc0ef1`](dlvhdr/diffnav@bfc0ef1) feat: convert config to YAML and nest under ui key - [`600d8ed`](dlvhdr/diffnav@600d8ed) feat: improve config file discovery - [`090abfc`](dlvhdr/diffnav@090abfc) feat: make ctrl+d/ctrl+u global for diff scrolling - [`23b3000`](dlvhdr/diffnav@23b3000) feat: replace h/l panel switching with Tab toggle - [`d6b2e73`](dlvhdr/diffnav@d6b2e73) fix: improve file tree selection styling - [`cad6633`](dlvhdr/diffnav@cad6633) fix: isolate panel navigation to prevent cross-scrolling - [`803f7a8`](dlvhdr/diffnav@803f7a8) fix: prevent delta colors from bleeding into file tree panel - [`a07e104`](dlvhdr/diffnav@a07e104) fix: prevent j/k from scrolling inactive panel - [`f5f8972`](dlvhdr/diffnav@f5f8972) refactor: use ansi.Truncate instead of custom implementation - [`e939dcf`](dlvhdr/diffnav@e939dcf) refactor: use camelCase for config keys - [`08a7356`](dlvhdr/diffnav@08a7356) style: capitalize TAB in footer help </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

dlvhdr reviewed Jan 7, 2026

View reviewed changes

pkg/ui/panes/filetree/filetree.go Outdated Show resolved Hide resolved

pkg/ui/mainModel.go Outdated Show resolved Hide resolved

pablospe force-pushed the mouse-support branch from 7755272 to bf5dd1b Compare January 7, 2026 22:41

pablospe added 10 commits January 8, 2026 13:20

feat: add mouse support

f0dd098

- Click on files in the tree to select them - Scroll wheel works in both file tree and diff viewer panes - Drag the border between panes to resize sidebar

feat: click on search box to enter filter mode

68a6086

feat: click on search results to select file

4837c67

fix: handle mouse events in search mode

ff20210

fix: prevent file tree scroll jump when clicking files

4de402d

Add SetCursorNoScroll method to filetree that updates selection without scrolling the viewport. Use it in handleFileTreeClick so the view stays in place when clicking a visible file.

refactor: extract isRootHidden() to reduce duplication

35af88e

Consolidate duplicate root-hidden checks into a single reusable method. Also fixes inconsistency where one check used '.' and another used dirIcon+'.' - now all use the correct dirIcon+'.' check.

feat: auto-hide sidebar when dragged below threshold

3d98d69

When user drags sidebar width below 10px, automatically hide it. Pressing 'e' to show the tree again resets to default width (26).

feat: show grab line when sidebar is collapsed

3200ec3

Allow dragging the sidebar back open by clicking and dragging the thin vertical line that remains when sidebar is hidden.

refactor: extract magic numbers to constants

dad63d1

Add constants for sidebar constraints and scroll speed: - sidebarMinWidth (20) - sidebarHideWidth (10) - scrollLines (3) Also add comment explaining Width(0) for grab line.

pablospe force-pushed the mouse-support branch from bf5dd1b to dad63d1 Compare January 8, 2026 14:14

dlvhdr approved these changes Jan 9, 2026

View reviewed changes

dlvhdr merged commit 8d516cd into dlvhdr:main Jan 9, 2026

pablospe deleted the mouse-support branch January 9, 2026 21:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

feat: add mouse support #49

feat: add mouse support #49

pablospe commented Jan 6, 2026

Uh oh!

dlvhdr commented Jan 6, 2026

Uh oh!

pablospe commented Jan 6, 2026

Uh oh!

dlvhdr left a comment

Uh oh!

Uh oh!

Uh oh!

pablospe commented Jan 7, 2026

Uh oh!

pablospe commented Jan 8, 2026

Uh oh!

dlvhdr commented Jan 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

feat: add mouse support #49

feat: add mouse support #49

Conversation

pablospe commented Jan 6, 2026

Summary

Uh oh!

dlvhdr commented Jan 6, 2026

Uh oh!

pablospe commented Jan 6, 2026

Uh oh!

dlvhdr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

pablospe commented Jan 7, 2026

Uh oh!

pablospe commented Jan 8, 2026

Uh oh!

dlvhdr commented Jan 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants